Allow out-of-tree builds.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@1859 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 471d5c2e1abe2c884f982cd992a774fb7a280966..6d7678e588cd7607848534de7f9774e0ce2b5cf4 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -1,3 +1,4 @@
+VPATH = @srcdir@
 
 VERSU=1_2_8
 VERSD=1.2.8
@@ -28,7 +29,7 @@ OUTPUT_SWITCH=-o #
 OPTIMIZATION=-O $(EXTRA_OPTIMIZATION)
 DEBUGGING=-g $(EXTRA_DEBUGGING)
 # add -DDEBUG_MEM to turn on memory allocation logging
-GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync \
+GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I@srcdir@/coldsync \
        $(INHIBIT_USB) $(OPTIMIZATION) @CFLAGS@
 INSTALL_TARGETDIR=/usr/local/
 

diff --git a/gpsbabel/jeeps/gpsusbstub.c b/gpsbabel/jeeps/gpsusbstub.c
index 7d843e9d7be4384485c532ec5ce61355c4ba7919..2209783f548c029533123169e84cf969382f08d0 100644 (file)
--- a/gpsbabel/jeeps/gpsusbstub.c
+++ b/gpsbabel/jeeps/gpsusbstub.c
@@ -21,7 +21,7 @@
 
 
 #include "garminusb.h"
-#include "../config.h"
+#include "config.h"
 #if !HAVE_LIBUSB
 
 const char no_usb[] = "USB suport is not available in this build.\n";